From e1f01744bf7fa38ff1669b17c39419fec0d56849 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 25 Aug 2022 06:59:51 +0100 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 532165 -> 532884 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index 35c0b746c7c..fc8819193fa 100644 --- a/Repository.mk +++ b/Repository.mk @@ -919,7 +919,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ ) \ )) diff --git a/configure.ac b/configure.ac index 928da05cfff526fa226ec4c6974d14e790e97006..9a3316bcdbccea02ce58141d4cee642d0a3f6504 100644 GIT binary patch delta 568 zcmX@QS7FLwg@!GRKG}R+3P2E@l~|UTlAjzqdEsHv>G#DLd3ee*OEPq!!qWq?7^T=@ zoWd+dbrvt6hUs&&7?stb!U`#w#feEdsl^KEsd=eIi6xo&c?$Vy3jQwM3NXcz(;2fF zHK)hMFdD;6)5>C0lLtE@R!0Zo7?9QRP-AT?Q;TEUZL=AHm;>LP=_IiGq>}vMG}n3d&43nZsf{y&{*5Z@OPFE8Fz_ zjVv6~>*ugYOy`=zCOCb`92UjN0irC^kIrF{pT6rpi_G)`cUicmGtFg@n*RC|i`eu7 zo0++$o6lttpMK#Jo9OiDxhzK0BOU;`AJSMjCQtA)oqlpIi|zCeeasxw+2*k*PG8x` zEij`%$(L5Hz>2CAcBqrYz=9peQ52#GGA838TOcs{uTjsHddVpd91ky6OI2BTJ zic`5bITcFtic?Dzyd1+EUHqMa;y_8L8n6lw8&yeK=JW^iSfs=ep#atF8SL)m;y<0y tf>}ZtT??0^b9`{9Q*ej|RIw)4bpIX}#dhiWEI`Z(#BAH8=d-V>2LO<3xnKYQ delta 219 zcmV<103`pE!yv`IAb_+1OlybjYypSuYyyYvYy-FLYy@gBmynqRB$u7K0SK26MFt9& z8}|Yjmk@mi4425A1RRrm90->eo&+*mu8*>7?+8I1QM5&o&+41w4MYXmx@9H z6qoOw1SFUHH3ABku!#Z$mkyl*4VN>Y1Q(aku>lU3V4nmrmzbLbNtg1U1TdE>padb8 z&4>gKmujE{Etlp`0uYzCpaeaa{GbFGla_K12ueX#K}1hODVJTL1R9rfXay3Nf0+ai Vhw7mOhw7mPhw7mQx9Xt>s(;9qQ_uha diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 0286cc6cdc6..f833c8b36fc 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) ifneq ($(gb_SUPPRESS_TESTS),) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 16eba69c3e3..0d5fca58d2c 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -42,8 +42,10 @@ endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ GeneratedPackage_uno_loader_classes \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index 377c8be0dc5..fc0daf1ed53 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2